Auto merge of #3652 - alexcrichton:beta-next, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 6 Feb 2017 01:49:47 +0000 (01:49 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Feb 2017 01:49:47 +0000 (01:49 +0000)
Fix beta branch CI

Cherry pick a few commits from master


Trivial merge